Minor refactoring
Removed "template trick" for forward-declaration implementations, and added implementatations in Entity.h