Restructured file structure to remove versioning via folder names