Rearranging test/config files and libraries