restructure for mvc
rm