All contrib modules go into contrib dirs
Updated makefile
Updated config from prof
Mods to deployment