Cleanup, moving the id collection stuff to the main bundle, manual registry of entities