restructure dirs. update setup file