Restructure files

Restructured the files for easier inclusion in projects.