Restructured directories in repo