Change extension to match standards
Moving things around for upgrades
Migrated home to new style