Moved some classes around to create a folder structure that is more easier to follow.