Moved all neighbourhood definitions to the neighbours class