Fixing directory structure, start on specification, miscellaneous issues