Reorganizing site structure, fixes