files in wrong branch, moving them
cleanup of files related to 2.5 opac changes