re-arrange repository structure, get tags and categories working a bit better