Refactoring and organizing...