Add array vs list
Re-structure files and add x mode