// Removed old structure and replaced with MVC structure.