Complete project overhaul