Reused namespace tweak and some change of filenames.
Clean up of files and compile script.