Updated to remove redundant directories