Changed directory structure
Merge branch 'test'