Clean up

-Added setter functions to Base
-Cleaned up file tree and changed project settings as appropriate