Package change

.core : means that user must use it
else : for convenience of user