moved files to appropriate locations