Separated code into files, added convenience methods for easier json discovery