Restructured folders

Now base classes are in there own folder