Minor project file reorg, moved some globals into common