Reordering directory structure to fit multiple machines now.