Issue66 revised site structure