Moved some directories around and started adding singleton manager creation/destruction functions.