22mth old obsessed with order

Hi,

My 22mths old son has become obsessed with having things in order of size, shape, colour, it started when he was about 13/15mths, he would line up averything he played with in a very neat line, and if it got disturbed or one item in the line got moved he would get very upset and frustrated, this has continued and now he put things not just in lines but in order of size and colour, after christmas I had a box of empty wine bottles and other jars for recycling in the kitchen as I was cooking dinner he took them all out lined them all up green bottles with green bottles clear with clear and so on, what worries me is how upset he gets when things dont stay in a line for him like balls or other object, is this normal in children his age? Im not a very orderly person myself and have no problem with having a bit of mess around once its not dirt, so I dont think he is picking this up from me?