organizing code in subfolders. changing imports to reflect dir structure.