AOSPA-ify

Signed-off-by: AlvaroOrduna <alvaro.orduna.92@gmail.com>