restructured data dir and renamed resources