Restructured and fixed for GH pages consumption