refactored the setup process to the new system...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>