Do some refactoring
Add workshop Android