Organizing the files in a more 'sane' way