Move classes into correct directories as per new namespace structure.