Refactors and moves of classes and members