Remade filestructure to better standars