reorganise folder structure a little