reorganise into extension and site folder