Cleanup and tweaks
Add v6 folder
Release 6.1 to 6.3