Made directories to match master branch