Fixing file layout of MMAW project.