Reorganized the files to make things "cleaner" for inclusion in other projects.