Update to match Cake convention

Renamed folders from Plural to Singular

Signed-off-by: Derek Smart <dereksmart@earthlink.net>