Some styles and to single package view and enhancing folder structure.