modified project structure to match passive MVC