Changed namespaces and removed uneeded files