move classes into folder