Added some classes, still in the super-initial setup-file-structure stage