Finishing the separation of classes/files/etc