refactored some of the code and moved the entry logic to the Main class
Merge pull request #10 from zonama-sekot/Refactoring-and-moving-entry-logic-to-one-place

refactored some of the code and moved the entry logic to the Main class