Map on taxonomy pages, restructure dirs