Did some more refactoring and all non-entity folders renamed with a '_' prefix so they get separated at the top.