Restructured files a little bit