Did some basic sorting into folders, more can be done later