Empire code and folder cleanup