Moved to more mvc style layout.