Move packages back into the main file.

This will simplify the Makefile and make dependencies more obvious.  Just a suggestion.!