Restructure to fit distools file org