Reorganize directory structure

The amount of files were getting unwieldy. This merge moves the files into a directory structure.