Merge branch 'Beta' into Dev-General

Updated file Layout from Beta branch