Moved files to new directory structure
Moved files to new directory structure