Merge in directory structure and naming updates.
Update script/style postfix
Fix folder name issue in functions.