Refactor

Refactored the entire App.