working on separating code into different files
Merge pull request #4 from KostyaKow/master

Updating