Restructuring files just a little bit