Commit before total changes in architecture.