Re-organize everything, not so messy
Fixup util script and manifest for re-org