Moved category forms to entry directory.
Updated include paths for new categories location.