New classes for entity system plus new android project