fixed package name problem; refactoring