Place into subdirectories and add support for tags