Feature/reorganize directory structure