Some changes to mvc structure