rearanjed file structure