complete update to the framework; new naming conventions, update of routing and viewing