reorganise to flatten project folder hierarchy