Configure org files structure and fix some errors