Modify Names
Update includes name
Remove utility directory