changed to new folder structure reflecting mvc and tdd