Cleaned up mvc, renamed