[+] Refactor to have better Interfaces and components