Restructured base module folders to reduce nesting