ctsit/dicombrarian

Rename folders and fix file organization

Shell