First commit for the restructuring with MVC 4 support