Modularize directory structure