Renamed all files to avoid collisions
Fixed all includes