add modulare namespace feature & update to DF2014

also a ton of white space fixes.