Refactor, changed name of package