Reorganized file structure in prep for some code re-writing