Got everything working and renamed package.