Moved classes to main folder