Moving files around, trying to bet better arch