MVC suggestions + git repo cleanup