moved controllers & added views