Further work on entities
More work on Entity JSON parsing
Additional package shifting for better organization