better organization, more topics - fixes #8