renaming packages and moving things around for easier cognition