updated for consistency
reorganized layers, debugged xbsv rpm