Moved includes to json, updated some formatting stuff, started writing Resource Class