cleaned up mapstructure, edited path's in index.