Fixed duplicated classes in different modules, left when merging Engine modules