move files into more sensible locations.