- Moved facotires to their own namespace