Implemented curator, restructured code, bug fixes