Added bash tools, reorganized