Changed namespace definition to the convention, added diary