This avoids inadvertently exporting a go package. This change also cleans up generate layout. Signed-off-by: Ophestra <cat@gensokyo.uk>
