Rename class to interface in 2 interfaces, set namespaces in interfaces, moved file to folder (sorry will keep these commits smaller in the future