reworked paths and namespace