Fixed folder and namespace naming.