Merge pull request #2 from yasgun/master

UPDATE IN FOLDER STRUCTURE