more reorganization and refactoring