Moved the definitions into separate roles for cleaner code and to make things easier to find