simplify

simplifying filestructure