Moved files according to Paul's last directory structure changes