Restructured application - engine more or less done.