Made wayset serializable
Refactored import/export to be more betterer