Merge pull request #3 from romyilano/master … 

merge madness (folder reorg)
latest commit f29c107858
Romy romyilano authored