Update file structure to last commit on Framework
Merge pull request #5 from camael24/updateToFwk

Update file structure to last commit on Framework