Added bin folder
Refactored code