Major update: Fix for missing headers #1 with new folders