cleaning up file structure in prep to merge to development with front-end