Moved files to comply with directory structure