Added main function to Console again
Refactored name again
More refactoring to get a more general case
Moved classes to new package