moving stuff into the correct place after a bad commit