Changing directory structure to reflect models, persistence, and user interface