Move scripts and tests into directories