Fix modules paths and remove reference to merged projects