Decided to make the namespace clearer
Updated namespace of modules used