Cleanup: removed obsolete and empty subdirs