COD-6 modifying structure to match the best-practice for projects