Refactor of file hierarchy complete.