Moving classes in different folders