Refactor staurn-core
Refactor