Glass pieces look better, files reorganised