Changed settings handling and prepare to add restructuring script