Cleaned up patrol script and restructured folders