Class diagram modifications + remove unuses import in MainActivity