Updated folder structure and namespace

Signed-off-by: Josemi Liébana <office@josemi-liebana.com>