[IMP] Structure separated from main branch to introduce other dir