Moved some classes into a better organization and cleaned up some typos