mocking an ajax call
clean up and reorg
Merge branch 'mocking-ajax-call'