Move classes to folders