Add more structure to application.