reorganize
Merge pull request #32 from TweetPressFr/trunk

reorganize