Restructured files in repo