Moved several files
new
Merge pull request #3 from fstagni/remake

Remake