Declutter all class names
Rename class files to match namespace