[IMP] Better modularity and naming convention