Switching to a controller based routing system
Renaming the messages folder to avoid a routing conflict