2170 -- COMMIT 18 : Restructured folder layout.