reorganization of files and datapath