merge projects

merge projects
rename namespace
clean up