Improved skeleton folder