reorganise source files into more folders