package layout, removed unused files