cleanup imports
put ipc stuff into the masters ipc dir
always use single quotes