Edit directory structure to support CI