rename and reorganise dart classes