1) Implemented basic threading library
2) Changed some file names due to include collisions