Added: save structure file back + bug fixes + folder restructuring