Did some quick organizing packages using filenames