Migrated to NeoBundle

This is tentative, migration back might be required in the future