Added fake data source and changed naming of controllers