Reverting the chaos caused. Slight restructure
Added rw primtive to registry.