restructure forever!
Merge pull request #36 from RAlmada/master

restructure forever!