[-] FO: Fix separated packages