cleaning up some files, defining file structure