Code cleaning

Some minor code cleanings like file renaming and removing unused namespaces