ranger restructuring
16 files changed