New structure

Compatibility with all android systems