Refactored project to simplify design.