Restructure the whole thing. Also one step closer towards PSR-2
Add before/after functionality.