Package name fix
Basic entity implementation