more sensible organization of modules
Taking out the trash