moved most classes to a new directory