Re-factor, clear folders from old project