Fix the skirt generation (refactor bug)
Refactored the headers files into cpp files.