Added toplevel Makefile
module reorganization