refactor of poc
file name changes