move classes to proper namespaced location