BASE-19 refactoring directory structure (hoping Travis and Jenkins will like this)