Rename a couple files. Remove debug code
Begin adding API for researching