a little reorganizing for the make system