Move libraries into sub-folder