Updated directory structure to support branches