Updates for fluid margins + padding on elements, some directory tidying.