-fix src tree structure for good portability