Updated NeoBundle
Imroved overall organization