Refactored namespace to fit this repository