Moving/Deleting files to align with vogon/master