restructured some things in the filestructure