rearranging dir structure, once again