Various fixes

Fixes include removing unused imports, refactoring file names and variable names and consistency fixes.
And possibly inform other opers about it through a server notice or something.