Fixed include errors caused by folder reshuffle