Start Cleaning up and organizing simulators