added normalize plugin to create category/tag ids
moved includes into subdirectories