Moved classes into their own file