Restructured the files into proper directories