Restructured files.

Some file paths will need to be fixed.