Refactoring to match other project structures.