Moved classes into separate classes based off of their usage.