Fixed warnings
Moved files to a package