cleanup and new resource dir