Refactor existing repo into 5.4 directory