changed naming and namespacing
Merge pull request #4 from creesch/development

changed naming and namespacing