Added uncomitted files
Fixed some namespace declarations