Merge pull request #19 from thomie/splitDirectories