Restructuring, moved XCP entities from api. to api.entity.