Moved shields to util
Improved documentation