Moved classes to folders