adjust package name
extract helper methods into a seperated package