added variables - and more files to move