Changed the order of directories to better match the expected use-case