Some small refactorings
Some small refactorings, moving and renaming stuff