Templating so that there is no more casting
Moving packages