restructuring file heirachy
reordering file structure