#19 - directory structure now matches maven artifact names. Plugins moved to plugin directory.