Updated directory structure
Merge remote-tracking branch 'refs/remotes/FunctionGen/master'