Reorder directories, fixed null output issue