Rearrange scaffolds, use ActiveAdmin & Decorators