non working version - restructuring project stage1