Fix subdir-objects and change prefix