Refactored code with clearer names
Removed android studio folder