Merge branches 'master' and 'dev'
Updated organization of code.