Dirs refactored for maven