Changed directory structure to be better for multiple variants