First pass at refactoring the make system to be more target oriented