initial
Merge branch 'master' into dev
folder structure for composer
added composer