Code Cleanup

Tree code cleanup, taken classes together, added icon to json