Revert "some clean up"

This reverts commit 9ca169811ed90a9155883c08073c92a868a911ef.
Renamed variables, methods and added constants.
Added a system level test and made small refactorings.
Added more system golden tests and extracted the Console dependency.
Small refactoring
Extract method
More
writelocation
more
more
more
more
more
more
more
more
.
more
.
more