namespace overhaul - commit 01

initial commit for overhaul of namespace & naming conventions