Restructured files some more