Moved files to new packages in module google to behave better.
Did some code analysis improvements.