Cleaned up new include files
Renaming files