Revert package name
Change paths