Added the Modules namespace
Removed deprecated building stuff