Initial updates to package structure, templates, dependencies