Update gradle configuration and project structure
Minor optimizations
Fix typo