Restructured files and renamed namespace.