Restructuring files

As discuted in #132