Moved some pages to their proper places and fixed links