First commit with new design & MVC Code structure