added folder icons; starting to change data format again to include icons