add structure. still need to work on main module files