More project refactoring, now moving the classes