restructure repository layout