Reorganise and add executables for each