Reorganizing again and adding functionality

still need to figure out how to import dynamically