Flattened admin/department sub packages into single package
Fixed (and cleaned up) broken feedback indicator
markup filename was not renamed
FormConfig acts a bit more like a builder