move spray files to appropriate package