major structure changes, folders and css