Moved irrigation into a separate file.  Refining service creation.