Fix some mistakes and move lists declarations to the own files.