Modularized the design

Signed-off-by: Koby Picker <kobzorz28@gmail.com>