chg: [main] new folder structure to be a better module

chg: [main] new folder structure to be a better module #144