moved some files
rename namespaces
rename folder to match namespace