Add categories and change archive to organise them