Fix directory structure
Use NeoBundle