reorganise layout of files