Commit before some classes refactoring