Added functionality to Entity class
Moved a bunch of stuff around to organize it into a suitable folder hierarchy