Refactor AsCore package