rebuilding to a better project
splitting DAPIS out.
refractoring