Fixed include directories and structure