move all code to package