Revert "Clean up solution. Decided implemet it on Java"

This reverts commit 29dd447fe644df0f9d7744f1dd9477223487af48.