Better android support + project structure updated