Moved categories out of redunant directory.