rearranging files; switching to stateProvider