Updated namespace and restructured rules folders