Refactor of application structure.