made a few namespace changes to imrpove the structure of the application