refactored package structure/added import-control