Rearranged files to take necessary source files out of the project root.