Merge pull request #3 from LeSpocky/master

organizing things