Updated the directory structure for the FMUs, related to ticket:2487