Added scaffolds for brackets, matches
Removed excess from controllers and views