Ammended initial upgrade
Autocommit: moving sql files to appropriate locations for commit 22725c83d25bd1f915ffce7ede693ebf3b7e4794
Fixed initial build