Moved relevant classes into subfolders