Moving test files to proper directory structure