Reorganize the project for easier addition of new features.