utility,modifier,import,and export added, cleaned up and all structured correcly