Reorganized inc directory structure