Moved classes to folders for better readability