Working app with refactored code
Annoying files removed