updated with new version number
reorganized filestructure
Changed case of namespace