Restructuring folder layout.