move files to internal
Merge pull request #735 from andrerod/dev

Moving files