Refactoring and adding proper executable