Reorganized the project's directory structure.

Made some small changes to account for moved files.