refact paths