Refactor App.class into src isntead of test