Added Entity Classes, Added Component Container