re-arrange to follow new plan; resolves #84