Moved files to appropriate locations