Some movings of controllers and views. Added aliases and data annotations.