restructure calc
specify preview import statements to reflect new package structure