chore: improve directory structure