some package refactoring, thanx mahula for assistance