fixed instrumentTest folder structure.
META-INF/services fix
moved build types config to own file.