Added better structure for testing as well as Backbone structure.