Update script setup for packaging
Move files out of redundant sub-hierarchy