Simple restructuring of directories, small CSS corrections