Move classes into folder