Move classes into different folders.