Final changes...

Comments, name change, remove unnecessary files.