organized file structure

importing from organized sub-folders.