Rename and upcase classes
Rename
Fix imports, add classes