Fixed NULL #Include & Cleaned Directories Up