Fixed gradle and package issues, clean compile