reorganizing everything to properly namespace