Commiting from work
Merged two versions of Restructure branch