More concepts and a bit of re-organizing