Move classes into directory