cleaning up file structure

reorganized file structure and URIs to reflect new file locations