Refactored custom modules support to use a single `modules` attribute

Signed-off-by: Seth Vargo <sethvargo@gmail.com>