Reorganise and add build scripts