Refactor of files to match intended structure.