FIX: remove esp-mvc
FIX: re-add esp-mvc