adapting build/package process to new structure