Clean-up
Refactoring to Core + Test + UI
Testing
Correct commit unnecessary file