Simplify the filestructure and make coherent to conventions.