reorganized code (folder/locations/etc)