Renamed

moved the using namespaces to the .cpp file and renamed some variações