Restructured files & included sidebar