reorganise: move files;
cleanup