Start to refactor into publishable app