Updated paths and exports