Fix base directory to source directory
Add ToSingular and ToPlural actions #61