Better source code dir hierarchy