re #31 moving library files to better locations