Organized the classes into different folders.