Convert to new makelib subdirectory model