Cleaned up the code structure. Ready to implement the environment and its interface.