changed directory structure
Merge branch 'foldermove'