Source tree refactor

DO IT!