Changing file structure to represent different architectures