Moved classes to seperate folder