move sources to simplify test-edit cycle