Renamed some files to be in line with class names, and to simplify dependency container code (and removing some requires)