additional files
Changes regarding the namespace problem. (Needs cleanup)