Added more filestructure