Updates, changes for 7th, improvements to layout.
Prepare for packaging
Move files into pacakge