Reorganise folder to allow direct cloning