Refactor/packaging arc core

some cleanning