initial dev 2/6/2014
restcruct namespaces
Merge branch 'feature/initial' into develop