Folder/library rearrangements. Trajectory crashfix